Drop row/column-span-column from tests

diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 47ca99207b7b9af3236f98538d77ee2e04638370..620608dc4885bfe98d9a1b2671783c3d20b3dc57 100644 (file)
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -529,8 +529,6 @@ test_type (gconstpointer data)
 
       /* Special restrictions on allowed values */
       if (pspec->owner_type == GTK_TYPE_COMBO_BOX &&
-          (g_str_equal (pspec->name, "row-span-column") ||
-           g_str_equal (pspec->name, "column-span-column") ||
            g_str_equal (pspec->name, "id-column") ||
            g_str_equal (pspec->name, "active-id") ||
            g_str_equal (pspec->name, "entry-text-column")))

diff --git a/testsuite/gtk/object.c b/testsuite/gtk/object.c
index 128b974714bc1f81b9e9ae59d81ef7f72e3e8d1b..7b48446cbc1151415ab2365356a6852a90765b3d 100644 (file)
--- a/testsuite/gtk/object.c
+++ b/testsuite/gtk/object.c
@@ -67,8 +67,6 @@ list_ignore_properties (gboolean buglist)
     { "GtkColorSelectionDialog","has-separator",        (void*) MATCH_ANY_VALUE, },     /* property disabled */
     { "GtkColorSelection",      "child",                NULL, },
     { "GtkColorSelection",      "current-color",        (void*) NULL, },                /* not a valid boxed color */
-    { "GtkComboBox",            "row-span-column",      (void*) MATCH_ANY_VALUE },      /* GtkComboBoxEntry needs a tree model for this */
-    { "GtkComboBox",            "column-span-column",   (void*) MATCH_ANY_VALUE },      /* GtkComboBoxEntry needs a tree model for this */
     { "GtkFileChooserButton",   "select-multiple",      (void*) MATCH_ANY_VALUE },      /* property disabled */
     { "GtkFileChooserButton",   "action",               (void*) GTK_FILE_CHOOSER_ACTION_SAVE },
     { "GtkFileChooserButton",   "action",               (void*) GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER },